ncbi-blast+ 2.17.0+ds-6: Unbreak 64-bit builds.

diff --git a/debian/changelog b/debian/changelog
index c4f7eba4b449217fd69c94c9b380d5295d03e4a9..e64a878d08b2cf3ac0dbd3bac3dae8ca96109662 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ncbi-blast+ (2.17.0+ds-6) unstable; urgency=medium
+
+  * debian/patches/support_x32: Unbreak 64-bit builds.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 17 Oct 2025 11:26:19 -0400
+
 ncbi-blast+ (2.17.0+ds-5) unstable; urgency=medium
 
   * debian/patches/support_x32: Fix wgsread.cpp for 32-bit architectures.

diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
index 016f095a71530741026ad1e0ee5886e0245a574c..485a62d8db834605d726b5319d0e0e018ec87c48 100644 (file)
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -38,7 +38,7 @@ Avoid picking up wrong inline assembly.
                 if test -n "$with_vdb"; then
 --- a/c++/src/sra/readers/sra/wgsread.cpp
 +++ b/c++/src/sra/readers/sra/wgsread.cpp
-@@ -6185,7 +6185,8 @@ void CWGSSeqIterator::x_CreateFeaturesCh
+@@ -6185,9 +6185,10 @@ void CWGSSeqIterator::x_CreateFeaturesCh
      // select range of feature table rows
      auto range = GetLocFeatRowIdRange();
      auto feat_start = range.first + kFeatPerChunk*index;
@@ -46,5 +46,8 @@ Avoid picking up wrong inline assembly.
 +    auto feat_stop = min<TVDBRowId>(range.first+range.second,
 +                                    feat_start+kFeatPerChunk);
      range.first = feat_start;
-     range.second = max(feat_start, feat_stop)-feat_start;
+-    range.second = max(feat_start, feat_stop)-feat_start;
++    range.second = max<TVDBRowId>(feat_start, feat_stop)-feat_start;
      // create features
+     info.chunk->SetData();
+     CSeq_annot::TData::TFtable* main_features = 0;